HDDS-12849. On demand container scanner should not be static #8296
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aswinshakil
reviewed
Apr 17, 2025
Member
aswinshakil
left a comment
aswinshakil
left a comment
There was a problem hiding this comment.
Thanks @errose28 for working on this. Overall, the changes look good. I have left some minor comments.
.../src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OnDemandContainerDataScanner.java
Outdated
Show resolved
Hide resolved
...er-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java
Outdated
Show resolved
Hide resolved
.../test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
Outdated
Show resolved
Hide resolved
.../test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
Outdated
Show resolved
Hide resolved
| } | ||
| OnDemandContainerDataScanner.init(c, controller); | ||
| onDemandScanner = new OnDemandContainerDataScanner(c, controller); | ||
| containerSet.registerContainerScanHandler(onDemandScanner::scanContainer); |
Member
There was a problem hiding this comment.
Can we pass the OnDemandContainerDataScanner itself here instead of using Consumer?
Contributor
Author
There was a problem hiding this comment.
We could, but I would rather keep the coupling between the two classes looser. We could make a scanner interface but it would only have one method and only be used here. The consumer was a light-weight way to get this same functionality.
Contributor
Author
|
Thanks for the review @aswinshakil. Comments have been addressed in the latest commit. |
aswinshakil
approved these changes
Apr 22, 2025
Member
aswinshakil
left a comment
aswinshakil
left a comment
There was a problem hiding this comment.
Thanks @errose28 for the update. LGTM. Pending CI
kerneltime
approved these changes
Apr 22, 2025
kerneltime
merged commit 229e5c9
into
apache:HDDS-10239-container-reconciliation
43 checks passed
errose28
added a commit
to errose28/ozone
that referenced
this pull request
May 6, 2025
…anner-builds-mt * HDDS-10239-container-reconciliation: HDDS-12849. On demand container scanner should not be static (apache#8296) HDDS-12745. Container checksum should be reported during container close and DN restart (apache#8204) Conflicts: hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OnDemandContainerDataScanner.java hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
The on demand container scanner was originally implemented as a static instance so that it could be easily triggered from anywhere in the code. This is now causing problems for reconciliation testing where multiple replicas exist in the same process. We are invoking on demand scans for each replica after it is reconciled, and these scans for different replicas are hitting the same container scanner concurrently. This is required for tests to pass in #7490.
Due to the layout of the datanode code, it is difficult to get items like this to all places where they are needed, which is why the on demand scanner was initially static. I have attempted to remedy this issue by adding a scan handler which can be triggered from the
ContainerSet.ContainerSetwas chosen because it is both created by theOzoneContainerwhich also initializes the scanners, and available in most locations in the datanode.What is the link to the Apache JIRA
HDDS-12849
How was this patch tested?
Existing unit and integration tests for on demand container scanner pass. New unit test added.